Merge branch 'matthiasc/for-master' into 'master'
authorMatthias Clasen <mclasen@redhat.com>
Fri, 22 May 2020 20:59:44 +0000 (20:59 +0000)
committerMatthias Clasen <mclasen@redhat.com>
Fri, 22 May 2020 20:59:44 +0000 (20:59 +0000)
commit962c4d6a6969bd406e6241a21eec47cbf807a718
treec0547df150a9e98a3250c2da054c4b225ba3943c
parent930d779eb338e457ccf0ea742b62489765a5531b
parent0f053d18047ffc901024206e6310ad7c2f1dcc5c
Merge branch 'matthiasc/for-master' into 'master'

text: Avoid clash of preedit and placeholder

See merge request GNOME/gtk!1955